bitkeeper revision 1.997 (40d818e5-TNUTwvYPW-Y6E4RqoNong)

Merge

diff --cc .rootkeys
Simple merge

diff --cc tools/xenmgr/lib/XendClient.py
Simple merge

diff --cc tools/xenmgr/lib/XendDomain.py
Simple merge

diff --cc tools/xenmgr/lib/XendDomainInfo.py
Simple merge

diff --cc tools/xenmgr/lib/xm/create.py
Simple merge

diff --cc tools/xenmgr/lib/xm/main.py
index 32a7be879b58731b47130f4410c170e5e861f244,9b2125a7c53c959afae6af1d3798ccb02ee88e6c..d1bcf3f9e6914cced8a777787088fe0271bfaf38
--- 1/tools/xenmgr/lib/xm/main.py
--- 2/tools/xenmgr/lib/xm/main.py
+++ b/tools/xenmgr/lib/xm/main.py
@@@ -123,13 -109,13 +123,13 @@@ class Xm
              return
          if len(args) < 2: self.err("%s: Missing domain" % args[0])
          dom = args[1]
-         server.xend_domain_stop(dom)
+         server.xend_domain_pause(dom)
  
      def xm_unpause(self, help, args):
 -        """(Re)start execution of a domain."""
 +        """Unpause a paused domain."""
          if help:
              print args[0], 'DOM'
 -            print '\n(Re)start execution of domain DOM.'
 +            print '\nUnpause execution of domain DOM.'
              return
          if len(args) < 2: self.err("%s: Missing domain" % args[0])
          dom = args[1]